Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: control adapters in control layers canvas #6287

Merged
merged 50 commits into from
Apr 30, 2024
Merged

feat: control adapters in control layers canvas #6287

merged 50 commits into from
Apr 30, 2024

Conversation

psychedelicious
Copy link
Collaborator

@psychedelicious psychedelicious commented Apr 29, 2024 •
edited
Loading

Summary

Adds control adapters to the control canvas:

  • global control adapter layer (controlnet only, "resize" only)
  • global ip adapter layer
  • countless fixes and enhancements

Related Issues / Discussions

n/a

QA Instructions

Please try it out.

Two major known issues:

  • If you undo after deleting an IP adapter or Control Adapter from the control layers canvas, you'll get an error and have to reset the UI. This is a hard problem to solve.
  • FF v125 has a bug relate to mouse events that tank performance. Solution is clear, will get to it tomorrow.

Merge Plan

n/a

Checklist

  • The PR has a short but descriptive title, suitable for a changelog
  • Tests added / updated (if applicable)
  • Documentation added / updated (if applicable)

@github-actions github-actions bot added python PRs that change python files invocations PRs that change invocations backend PRs that change backend files frontend PRs that change frontend files labels Apr 29, 2024
@psychedelicious psychedelicious changed the title Psyche/feat/UI/rcc control feat: control adapters in control canvas Apr 29, 2024
@github-actions github-actions bot added the frontend-deps PRs that change frontend dependencies label Apr 29, 2024
@psychedelicious psychedelicious changed the title feat: control adapters in control canvas feat: control adapters in control layers canvas Apr 30, 2024
@psychedelicious psychedelicious marked this pull request as ready for review April 30, 2024 03:53
@psychedelicious @hipsterusername
feat(ui): add 'control_layer' type
91a13b6
@psychedelicious @hipsterusername
refactor(ui): move positive and negative prompt to regional
feb9373
@psychedelicious @hipsterusername
refactor(ui): move positive2 and negative2 prompt to regional
e463c02
@psychedelicious @hipsterusername
refactor(ui): move size state to regional
b78648d
@psychedelicious @hipsterusername
chore(ui): lint
3f0d132
@psychedelicious @hipsterusername
feat(ui): revise internal state for RCC
bb4fae2
@psychedelicious @hipsterusername
tidy(ui): minor ca component tidy
0efe289
@psychedelicious @hipsterusername
fix(backend): do not round image dims to 64 in controlnet processor r…
e482b87 
…esize

Rounding the dims results in control images that are subtly different than the input. We round to the nearest 8px later, there's no need to round now.
@psychedelicious @hipsterusername
feat(nodes): add prototype heuristic image resize node
e876133 
Uses the fancy cnet resize that retains edges.
@psychedelicious @hipsterusername
WIP control adapters in regional
869b5c2
@psychedelicious @hipsterusername
perf(ui): do not cache controlnet images unless required
5f62e6b
@psychedelicious @hipsterusername
fix(ui): fix canvas scaling when window is zoomed
a0f9208 
Konva doesn't react to changes to window zoom/scale. If you open the tab at, say, 90%, then bump to 100%, the pixel ratio of the canvas doesn't change. This results in lower-quality renders on the canvas (generation is unaffected).
@psychedelicious @hipsterusername
feat(ui): reset controlnet model to null instead of disabling when ba…
4f3f097 
…se model changes
@psychedelicious @hipsterusername
feat(ui): hold shift to use control image size w/o model constraints
e5f4cdc
@psychedelicious @hipsterusername
fix(ui): add missed ca layer opacity logic
f6a6b35 
didn't stage the right changes a few commits back
@psychedelicious @hipsterusername
fix(ui): unlink control adapter opaicty from global mask opacity
0c04b90
@psychedelicious @hipsterusername
feat(ui): remove select layer on click in canvas
2f89697 
It's very easy to end up in a spot where you cannot select a layer at all to move it around. Too tricky to handle otherwise.
@psychedelicious @hipsterusername
feat(ui): tweak layer list styling to better indicate selectablility
b40ac2c
@psychedelicious @hipsterusername
fix(ui): tool preview/cursor when non-interactable layer selected
84925f5
@psychedelicious @hipsterusername
fix(ui): deselect other layers when new layer added
776e6d7
@psychedelicious @hipsterusername
feat(ui): move global mask opacity to settings popover
62b4848
@psychedelicious @hipsterusername
fix(ui): ip adapter layers always at bottom of list
d23f8ae
@psychedelicious @hipsterusername
feat(ui): layer layout tweaks
5b5d43c
@psychedelicious @hipsterusername
fix(ui): filter layers based on tab when disabling invoke button
3582cc5
@psychedelicious @hipsterusername
perf(ui): reset maskobjects when layer has no bbox (all objects erased)
65bc2b8
@psychedelicious @hipsterusername
fix(ui): ip adapter layers are not selectable
b9ad792
@psychedelicious @hipsterusername
chore(ui): lint
40d8663
@psychedelicious @hipsterusername
tidy(ui): move regionalPrompts files to controlLayers
63b4ece
@psychedelicious @hipsterusername
tidy(ui): "regional prompts" -> "control layers"
f2d5dbe
@psychedelicious @hipsterusername
tidy(ui): more renaming of components
a8ba560
@psychedelicious @hipsterusername
tidy(ui): more renaming of components
a655a77
@psychedelicious @hipsterusername
tidy(ui): more renaming of components
2fc8e74
@psychedelicious @hipsterusername
feat(ui): make control image opacity filter toggleable
1bd7aca
@psychedelicious @hipsterusername
chore(ui): lint
7841182
@psychedelicious @hipsterusername
feat(ui): collapsible layers
d97acd3
@psychedelicious @hipsterusername
fix(ui): layers default to expanded
93c2f76
@psychedelicious @hipsterusername
fix(ui): "Global Settings" -> "Settings"
c8508af
@psychedelicious @hipsterusername
fix(ui): layer layout orientation
89a85cd
@psychedelicious @hipsterusername
feat(ui): display message when no layers are added
81e9d6e
@psychedelicious @hipsterusername
feat(ui): border radius on canvas
4d4c250
@hipsterusername hipsterusername merged commit 631878b into main Apr 30, 2024
14 checks passed
@hipsterusername hipsterusername deleted the psyche/feat/ui/rcc-control branch April 30, 2024 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hipsterusername hipsterusername hipsterusername approved these changes

@blessedcoolant blessedcoolant Awaiting requested review from blessedcoolant blessedcoolant is a code owner

@maryhipp maryhipp Awaiting requested review from maryhipp maryhipp is a code owner

@lstein lstein Awaiting requested review from lstein lstein is a code owner

@brandonrising brandonrising Awaiting requested review from brandonrising brandonrising is a code owner

@RyanJDick RyanJDick Awaiting requested review from RyanJDick RyanJDick is a code owner

Assignees
No one assigned
Labels
backend PRs that change backend files frontend PRs that change frontend files frontend-deps PRs that change frontend dependencies invocations PRs that change invocations python PRs that change python files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@psychedelicious @hipsterusername